ec: remove semi-colons
ec: compare strictly against null
ec: define on use
fix