Cleaned up some things...urgh