Renamed activities and class members
Removed empty lines and auto-indented code