Quick clean and added license header!