cleaning up code, var changes to make more specific, etc