cleand up syntax