Clear code, improve code