refactor + clean up
refactor + clean up