minimized code some more