cleaner
less
refactoring
work in progress