Just moved around a lot of stuff to make things easier to read/navigate