Code refactoring and bug fixes
Removed artifacts