Changed OOP Implementation

made the code a bit cleaner thank to another redditor's suggestions.