CodeStyle
CodeStyle Hathor. Closes #3796
CodeStyle