More cleanups & standardizations