goodbye ugly checkbox and more cleaning