Remove unused code. Rename vars for readability.