builder comment remover fixed
some structuring