Cleaned up app delegate
Using new prefix style
Fixed merge conflicts