Minor change
Better function names