Code refactoring & Cleaning