Removed aggregate log message. Cleaned up code.