style update + further development