Resolved some style todo's.