Some styles to feedback added
Some refactor