Cleaned up  syntax