#61 Enhanced Code Quality

- Lesser duplicate code
#61 Enhanced Code Quality

- New changelog