removing extra-clever code ;)