Touchup spacing/indentation, and DRY/refactor code