Clean up functions.php

Code clean up & whitespace.