Removed debug printing and c++ style comments