Why did I even do that?!
More tweaks and cleanup