Less do-notation

slowly removing do-notation from Core