[WIP] Cleanups, tweaks and comments