got rid of some duplication and returns in supernatural module