some style updates and changes