Cleanup code formatting