[fix] change variables
[minor] add sort and styling