Refactor - empty hash-table
Refactor - improve readability