More generic styling completed.

Signed-off-by: Stu Goodman <stuart177@gmail.com>