removed unnecessary comments and debug output