Removed unused code, refactoring