Cleaned up everything on the root. Things are all-around easier to read.