Changed to smaller size, cleanup