WIP: clean up: 100%, fix code: 10%