Some suggestions + Cleanup

All this in preparation for next AI iteration.