Cleaning code in prep of merge with master