Fix overriding, make stuff cleaner