I would read "Refactoring" by Martin Fowler, if you haven't already. It will help you understand what OO code should look like and give you the tools to help get you there.
Personal opinion: The book "Refactoring" by Fowler is one of the worst (tech) books I have ever read. I would rather refer OP to the bible of OOP: Object-Oriented Software Construction by Bertrand Meyer.