Refactor for shorter line lengths