functionality is allright, look and code feel not

Signed-off-by: james94jeans2 <jens@FPT>