Tidies up methods