Another attempt to simplify code elements