Improved readability

And deleted some unused classes