Removed unused files; Refactored functions