Minor changes and code cleanup (no running code, WIP).