More cleanups & comments