Refactor so it doesn't break the 80 column rule