Minor Changes based on Code Review