Refactored some code
https://github.com/FoxUSA/OpenNote/issues/79