Refactoring the Licence Headers + shortening to long lines of code