Fixing some indentation and making methods chainable.