refactor
styling
cleanup