Did some style changes