A little more cleanup
Removed 2 more returns