Fix parser and some style