Codestyle cleanup

Also check #1708 and #1709 

@DeepDiver1975 @LukasReschke @Raydiation @butonic @samtuke @schiesbn