Cleaned code and removed var types handling

Cleaned code and removed var types handling (it isn't necessary).