Random cleanups

Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>