Some code cleanup
Did you mean?