Style fix and removal of inconsistant copyright