Small refactor

Authored by ivan on Jan 3 2019, 10:26 PM.