Cleanup and minor changes after code review