Minor cleanup & comments