add app name and cotroller suffix and cleanup comments