added final to some fields