Change identation and delete unused params and methods.