Corrected references.
Removed unneeded parens.
Fixed function ordering.
Removed empty constructors.