cleaned up, renamed vars