Changed logging to use local final class instead of LogIt class.
Basic cleanup of code after some analysis