refactored & clean upx