remove dup declaration
Adjust style to remove dup declarations
Merge branch 'feature/styles'