Code Cleanup for issue #12 consistency of variables and naming