Inherit from generic-host and large whitespace/indentation cleanup