refactoring and file clean ups