Signed-off-by: fsk <filip.srbinovski@hotmail.com>
Improved naming, formated the code

Signed-off-by: fsk <filip.srbinovski@hotmail.com>