Got rid of repeating patterns, and simplified a little