Cleaned up confirmation prompt code

removed explicit parameter, and redundant returns