Made methods chainable + small cleanups.