Styleguide cleanup

# Changes
 - Minor reshuffling.