[WIP] code cleanup
[WIP] code cleanup