Made real privates and fixed indentation.
General clean up.