changed id names and added javadoc