Aim system restyling

Pulled some restyling out of my aim system PR, the conflicts were starting to pile up.