Cleanup of App main
Annotate'd files