Updated with fixes per lint