removed some static imports
added javadoc