Cleaning code. More activities/events as modules