Cleaned up audio controller