Code clean up and method chaining