Cleanups + Simplifications