code cleanup
web modified as per mobile app