Small syntax, semantic and formatting fixes.