Simplified code
Removed TODO items