Simplified code and Changed naming