made unit.hpp a bit nicer