cleans up init
Reduces complexity by modularity