Refactoring
Signed-off-by: Nikolay Chankov <f.sk@abv.bg>