Some minor refactoring.

I hope you don't mind that changes.  They aren't essential.  I recommend using properties.  The overhead of using them is negligible.