I agree with you and it'll be refactored in [BLD-960](https://edx-wiki.atlassian.net/browse/BLD-960).