Finishing making style
small fixes