Clean up comments and unnecesarily commented code for readability