Changed var names and style

- I changed the variable names and tuple return style as per Thanh

- I also fixed a small bug with the icon from the last commit, which I
still have not tested.