Massive cleanup, formatting, and organization