Cleaning things up

Swapped out some lengthier statements for comprehensions and tried to
minimize the space my code is taking up while still maintaining
readability