clean up syntax with eriks suggestions