reorg + cleaning up language, naming and instructions