fixing duplicate id + minor codestyle