Minor changes, the char array as static final