Code Cleanup

Space out code sections more, other misc changes