[fix] style and slight clarity fixes