Remove debug print
Minor code style fixes