format
minor clean up
Fix spec