fix formatting and remove non-overridden methods.