Added app class
Removed comments..
Merged