reorganising, made built file a few kb smaller