Cleaned factory package
+ Javadoc comments
+ general comments