Code clean up of some classes