Cleanup to clean code style.