Removed some variables in favor of expressions