[Codechange] Minor cleanup
[Update] Misc. progress, latest code (WIP)