Prettifying the App Code

Made code a bit more readable.