cleanup. Moving lots of one-liners into one file to reduce load times.