cleanup whitespace
use right methods and args
bring back namevar
wat
fix spec