Renamed methods for clarity + added Javadoc