bugfix: incompatible overridden method + minor cleanup