clean code, improve function naming