Added string references, removed hardcoded strings