Refactor manifest
Some more comments for Javadoc