Formatted code, moved things around in prep for adding new stuff