lint.. depth..
refactor wip
refactor wip