style improvements/polish