removing two return in a method