Add ability to exclude method from public hash
Refactor a bit