refactored to list by environment and application