added deletion, adjusted formatting and flow