Clean-up & style edits