Fix style issues and set seen flag