Coding style and reduce cyclomatic