fixing some code standards