Some improvement - Thanks to @Fabian for the suggestions

Signed-off-by: Sovak <Sovak007@gmail.com>