Cleanup, fix annotations an typos