Removed commented out code
License header added/adjusted