Formatted with new templates

Signed-off-by: Ondrej Skopek <skopekondrej@gmail.com>
Cleaned up with new templates

Signed-off-by: Ondrej Skopek <skopekondrej@gmail.com>