clean stupid logic