cleaning up source missing paren and new simple rules