Chopped up methods, indentation fix