Code Review and Cleanup