Refactoring, clearing logs.
Improved guard placement for large objects.