code cleanup and start with "brute force"