Went through and cleaned a few things up