Style fixes... in general - move to oop