Move filter logic into angular filter and standardize indentation throughout the app