Separating methods into classes & fixing bugs that created