#226 code formatting