Minor tweaks
Remove boolean