Even more syntax and style corrections