Code clean up II; simplifying license header, removing this., reverting a lot of stylecop fluff