Cleaned some classes and added TODOs for future tasks