rewrite a bit for my coding standard compliance
# This is a combination of 5 commits.
# The first commit's message is:
fix up the style & some bugs in models/

# This is the 2nd commit message:

m0ar style tweaks

# This is the 3rd commit message:

style guide strikes again

# This is the 4th commit message:

still cleaning out friggin :use groups

# This is the 5th commit message:

namespace patches as well as a decent style fixup
fix up the style & some bugs in models/

m0ar style tweaks

style guide strikes again

still cleaning out friggin :use groups

namespace patches as well as a decent style fixup

still fixing my old style..