commeniting and indenting, cleaned some code.

Removed filling of activities from activityController and removed
commented code.