Cleaned up comments
Cancel now closes the frame.