finally nice and neat