Code formatting, removal of unused main()