Created new classes and improved method name readability