removed commented code, kept attribution