Code cleanup M1

GOTOs and label:'s removed
Awaiters fixed