code review & cleanup
Merge pull request #75 from massiveart/testing/navigation

code review & cleanup