Fixing code standard and styling issues