Code style fix and cleaning