Cleaned code, but HTTP on update can't fit