Refactoring & Cleanups