Part of refactoring.

Signed-off-by: Nikola Olah <nolah@WS-NOLAH-PC.execom.co.yu>