fix style + naming