small tweaks, remove unnecessary check