Added doc. Renamed methods