Did some minor cleanup of the Scan Button