Refactor the manifest to be more DRY
Clean up extra spacing
Merge pull request #36 from liftopia/refactor-manifests

Refactor the manifest to be more DRY