Style bugs fixed