Code refactoring & removing testing classes