web app - code cleanup;