Cleanups & Consistency Fixes