make and clean up tmp dir properly
Remove trailing space
Bolt style changes