Cleanup of code style.