Improved code style and removed unused class