Refactoring + Code cleanup