Tidied up requires, and refactored blank checks