Refactor weight display