FIX spacing and style