CLeaned up methods