Commenting and re-factoring minor parts of application