Code cleanup + copyright