P: removed unnessecary case / formatting