Changed some display and  code practice issues.