Update to new version of code.
Remove dedundant method definitions.
Replace unsafe_view by view
White space only.