Code style fix + strict standards fix