refactore rest of ridiculus return statements