Code styling fixes and return values for #4244