Removed comments, added sanitation