Improved builder
Code style