Refactor into classes, update style