Added modifiers
Commented debug code
Improved comments
Added enhancement comment (see #1)