Fixed crash on dismissal
Removed cruft
Spacing
Fixing a memory leak