added Leif's style change suggestions