Cleanup
Slowly working down to what I actually use
Minor spacing update