Cleanup
Some better naming of variables