Small refactor and updating copyright to 2014