Code Cleanup, modifications to Flipviewcontroller