Refactored some code, cleaned up whitespace issues and indentation
Added mock dolby object for testing and debugging