Basic cleanup
Added glimpse version and viewcontroller cleanup