cleaned up some return statements