Removing extraneous logging info
Making variable names more useful. Removing dead code.