Removed multiple instances of return statements in single methods