Slight edits and deleted template