refactor the painting decorator
remove a test function
make the validations shorted