Code Janitor

just sweepin some of this stuff up.