some style and some TODOs