Cleanup code style