Changed formatting to match global style, Fixes

Removed some accidents
Added a bit to make things safer.
Tiny update, but a useful one.