cleaned this up, no need for javadoc