just a bit of code clean up nothing much (and a few hiddend things)