removed exceptions, javadoc comments, cleaned up code