Code Review and clean up