Cleaned up some formatting issues, removed etags handling and data validation.