little refactoring
fix head and drawer parser