Javadoc + code efficiencies