Cleaning up syntax.