clean up time!

first batch of edits