better vars naming and cleanups