Added delete. Code style fixes.