Thunder cloud updates (code clean up)