Fix coding style and moduleclass order.