some general aestetic cleanup