some style changes modified