removed redundant values

plus edits