Cleaned up syntax

Cleaned up syntax