Javadoc added, return simplified