Code cleanup

nothing much really.