Moving away from the unnecessary code separation
Removing debug output