Fixed paren stripping
Variables are not null anymore
House cleaning