Cleanup code for review