Split the application into multiple files. Removed commented code.