civilized code a little bit