Cleaned up syntax, removed comments, etc;