Refactor stockradar