#317 Code formatting