removed more multiple return statements