Signed-off-by: bayunthecat@mail.ru <bayunthecat@mail.ru>
Minor improvements