manifest refactor
Merge pull request #61 from jsterken/manifest_cleaning

manifest refactor