Cleaning and add kprintf() statements