Cleanup whitespace and DRYness