Encapsulate unread logic
style fixes