Remove implicit declarations
Changed position of units; still ugly