Consolidating improvement, naming functions.