Fix up spacing
Shy away from .pop() if we dont need to use it
Shy away from .pop() if we dont need to use it
Be less redundant