Move to object-oriented structure, tidy code