little bit refactoring and updated copyright messages