Angular Controller was improved.