Janitorial stuff

Made methods for things sitting in main, cleaned out some useless stuff.