Adding some more return statements so we don't adding in the future and execute code by accident