CE-26 Small style changes