Meandering through - doc'ing / cleaning