removed gump gif
code cleanup and refactoring