Clarified views, added comments