update: small improvements in the code fix: fixed minor issues
Signed-off-by: Iuri Iurev yurievyuri@live.com