changed some method scopes
Todo-refactor hooks to external file - DEVNOTES.md