Property cleanup, style-guide conformance, and improved comments per Dan's feedback.