Code style reviewed