style and spaces fix