cleaning up syntax