#252 Formatting