Rename methods, fix indentation