Working on activities
Refactored activities
Trival comment