Increased logging package code cleanuup and commenting