Cleaned up log and made sure tests pass