Const moved to main() arguments; Removed commented code
Cleaned up