Fix syntax complications (too excited :/ )