remove superfluous begin..end block
cosmetic
cosmetic / rename
cosmetic