cleaned up main
Merging before pushing