Cleaned up code quality