Comform to project coding style