Remove comments and small changes