Reduced memory footprint significantly

Saved almost 1Kb of SRAM