fix indentation and add improved methods to overrider class