Cleaned up syntax mostly