refactor (coding style) #23 issue, add #25 issue