refactor: remove unnecessary code

Move from java-style to golang-style ... to produce clean code.