Renaming the activities
Code clean up and documentation