handle_update, pep8, todos

Change-Id: I207d4a733a42bcd13b74c0c2fe1e76073a567ac2