Fixed, changed, added copyright header (thanks @chefkoch for CodeCleanup tool!)
Deleted orphaned file