Changed the utilities to static
Added missing javadoc
Changed some auto-generated //TODO's to other comments