Cleanup up organization of file, prepping for JS work