Variable naming convention applied, previous fix fixed ;)