Removed Passing by Reference for Immutable Arguments.

Did a bit of clean up too.
Merge branch 'nav'