Use more uniform initialization