close #437; Condense and refactor some code block args for readability's sake