Cleanups & efficiency improvements