Cleaned up.
Switched to camel notation.