minor convention fixes + removed randomly chosen times
initial cleanup activities
Removed more redundant code on activities
more on activities