Some interface changing + codestyle