Moving private definitions back into .cpp and normalizing public definit...

...ions.