WIP
WIP, code cleanup
cleanup