Renamed variables without underscores, using capitalization instead.
Cleaned up client-side code.