Added missing var
Style improvements