Small code cleanup
cleanup up code