General clean up and coding standards compliance.