Fixed encoding and scope
Removed commented lines