small style and syntax changes