Refactored AudioProperties classes in some ways