Style and semantics changes. Looks nicer too.