Some style- and structural fixes