clean + refactor well