Cleaned up the syntax structure