Small improvements and removing of debugging info