Breaking up the long one liners so the codebase is easier to review on Github