fixed style stuff
merged files