#12 Fixing the issue with missing return
#2 Adding close methods on the views for cleanup