refactor + BuildList with example
cleanup