Cleaned up StructureBuilder's code