added delete, did some formatting cleanup