Updated code structure to match in a more general fashion.
Merge branch 'local' into github

Updated coding style to be more consistent and general.