Cleanup javadoc
Cleanup mime types
Refactoring