Changed description, added some Javadoc'ing