Cleaning up 1 by vakurii