Coding style clean