Refactor and fix app to work with NORAD api