Fix state leak
Fix style specs