mega rreworking of var and class names + some cleanup