More refactoring.

Signed-off-by: Stajic Igor <igorstajic273@gmail.com>