Improved the builders and cleaned up code.