Simplified some helper private methods, removing not used parameters

 - added some debug log to track bugs