Get rid of string constants for levels and results; cleanup code