Cleanup

Code cleanup to adhere to code style conventions.