FIX Style issues