Separating methods into classes, tidying