Refactor

I did a refactor about var names and some css