Cleaned up some code, removed debugging info log entries