Better var names
Code cleanup