Code clean up & whitespace