Codestyle; Closes #3903