Encapsulated into functions
Merge pull request #3 from kobe6672823/hm-dev

Encapsulated into functions