copyrights update + refactor