Cleaning up how everything looks
Merge