- removed a few unnecessary temporary objects
- unnecessary copy-construction of objects
- formatting cleanup (whitespaces)