Added comments and few cleanup
#74: contact view with notification ways