Fixed, refactored and improved arch brush code