Comments cleanup, logging info update