Removed commented code and fixed an encoding issue