Remove some debug messages, code style