Cleaned up the syntax a bit