Edited existing files

Signed-off-by: Antonio Krog <antonio.krog@sartura.hr>
Further editing of commits