Cleanup and introduction of __main__ / main()