Removed a bunch of return statements