Improve code from previous commit