better refilter method, consistent tab usage
build