Breaking up methods a bit