Revert "changed: code cleanup"

This reverts commit ed78fea02f11a794a6565f06128e1e71ea449f7c.