Cleaned code and Log messages, for testing at higher volumes.