Code cleanup. >Going to need a ton more.