additoinasl refactoring and documentation