Uniform initialization and comments