Removed a few redundant bits.
ocp-indent
Various little tweaks.