Did some style cleanup